From b55d6e4bc93e974955fb69b7cdab13cabd178064 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@src.gnome.org>
Date: Thu, 15 Mar 2007 21:00:07 +0000
Subject: [PATCH] remove spurious conflict marker from ChangeLog

svn path=/trunk/; revision=17527
---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 809dc576fc..77670501ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,7 +51,6 @@
 
 2007-03-15  Emmanuele Bassi  <ebassi@gnome.org>
 
->>>>>>> .r17523
 	* gtk/gtkrecentchooserprivate.h:
 	* gtk/gtkrecentchooserutils.c: Move filtering of the recent
 	files list into the shared implementation; do the filtering
-- 
2.30.2